Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 28 May 2011 19:14:18 +0000 (12:14 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 28 May 2011 19:14:18 +0000 (12:14 -0700)

Trivial merge